From b6112c6ed6d6a82c4822e3cb16270edc89ae42b7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 2 Nov 2015 23:43:58 -0500
Subject: [PATCH] Adwaita: Update menu item styling

Adapt to the changes in the previous commit.
---
 gtk/theme/Adwaita/_common.scss           | 15 +++---
 gtk/theme/Adwaita/gtk-contained-dark.css | 65 +++++++++++-------------
 gtk/theme/Adwaita/gtk-contained.css      | 65 +++++++++++-------------
 3 files changed, 69 insertions(+), 76 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 876553b7b2..bcf26a46c4 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -954,7 +954,7 @@ combobox {
   &:backdrop:insensitive {
     color: $backdrop_insensitive_color;
   }
-  .menuitem { text-shadow: none; }
+  & menuitem { text-shadow: none; }
   &.separator.vertical {
     // always disable separators
     -GtkWidget-wide-separators: true;
@@ -1453,7 +1453,7 @@ treeview.view {
   padding: 0px;
   box-shadow: inset 0 -1px transparentize(black, 0.9);
   &:backdrop { background-color: $backdrop_bg_color; }
-  & > .menuitem {
+  & > menuitem {
     padding: 4px 8px;
     &:hover { //Seems like it :hover even with keyboard focus
       box-shadow: inset 0 -3px $selected_bg_color;
@@ -1473,7 +1473,7 @@ menu,
   background-color: $base_color;
   border: 1px solid $borders_color; // adds borders in a non composited env
   .csd & { border: none; }  // axes borders in a composited env
-  .menuitem {
+  & menuitem {
     text-shadow: none;
     padding: 4px;
     &:hover {
@@ -1489,8 +1489,8 @@ menu,
       background-color: $backdrop_base_color;
     }
     //submenu indicators
-    &.arrow { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); }
-    &.arrow:dir(rtl) {-gtk-icon-source:-gtk-icontheme('pan-end-symbolic-rtl'); }
+    & arrow { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); }
+    & arrow:dir(rtl) {-gtk-icon-source:-gtk-icontheme('pan-end-symbolic-rtl'); }
   }
   & arrow { // overlow buttons
     @extend %undecorated_button;
@@ -1507,7 +1507,7 @@ menu,
   }
 }
 
-.menuitem accelerator { color: gtkalpha(currentColor,0.55); }
+menuitem accelerator { color: gtkalpha(currentColor,0.55); }
 
 
 /***************
@@ -2101,7 +2101,7 @@ switch {
   }
 
   //menu
-  .menu .menuitem.#{$w} {
+  menu menuitem.#{$w} {
     -gtk-icon-source: -gtk-icontheme('#{$a}-symbolic');
     color: mix($fg_color, $bg_color, 60%);
     icon-shadow: none;
@@ -2513,7 +2513,6 @@ GtkScrolledWindow {
 }
 
 //vbox and hbox separators
-.menuitem.separator,
 separator {
   // always disable separators
   // -GtkWidget-wide-separators: true;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index fd1a3308a3..6fe56b936d 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1460,7 +1460,7 @@ combobox {
     icon-shadow: none; }
   combobox:backdrop:insensitive {
     color: #5d6767; }
-  combobox .menuitem {
+  combobox menuitem {
     text-shadow: none; }
   combobox.separator.vertical {
     -GtkWidget-wide-separators: true; }
@@ -1979,12 +1979,12 @@ treeview.view header .titlebar button.titlebutton,
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1); }
   .menubar:backdrop {
     background-color: #393f3f; }
-  .menubar > .menuitem {
+  .menubar > menuitem {
     padding: 4px 8px; }
-    .menubar > .menuitem:hover {
+    .menubar > menuitem:hover {
       box-shadow: inset 0 -3px #215d9c;
       color: #4a90d9; }
-    .menubar > .menuitem:insensitive {
+    .menubar > menuitem:insensitive {
       color: #949796;
       box-shadow: none; }
 
@@ -1997,30 +1997,30 @@ menu,
   .csd menu, .csd
   .menu {
     border: none; }
-  menu .menuitem,
-  .menu .menuitem {
+  menu menuitem,
+  .menu menuitem {
     text-shadow: none;
     padding: 4px; }
-    menu .menuitem:hover,
-    .menu .menuitem:hover {
+    menu menuitem:hover,
+    .menu menuitem:hover {
       color: #ffffff;
       background-color: #215d9c; }
-    menu .menuitem:insensitive,
-    .menu .menuitem:insensitive {
+    menu menuitem:insensitive,
+    .menu menuitem:insensitive {
       color: #949796; }
-      menu .menuitem:insensitive:backdrop,
-      .menu .menuitem:insensitive:backdrop {
+      menu menuitem:insensitive:backdrop,
+      .menu menuitem:insensitive:backdrop {
         color: #5d6767; }
-    menu .menuitem:backdrop, menu .menuitem:backdrop:hover,
-    .menu .menuitem:backdrop,
-    .menu .menuitem:backdrop:hover {
+    menu menuitem:backdrop, menu menuitem:backdrop:hover,
+    .menu menuitem:backdrop,
+    .menu menuitem:backdrop:hover {
       color: #949796;
       background-color: #2c2c2c; }
-    menu .menuitem.arrow,
-    .menu .menuitem.arrow {
+    menu menuitem arrow,
+    .menu menuitem arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
-    menu .menuitem.arrow:dir(rtl),
-    .menu .menuitem.arrow:dir(rtl) {
+    menu menuitem arrow:dir(rtl),
+    .menu menuitem arrow:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
   menu arrow,
   .menu arrow {
@@ -2041,7 +2041,7 @@ menu,
       background-color: transparent;
       border-color: transparent; }
 
-.menuitem accelerator {
+menuitem accelerator {
   color: alpha(currentColor,0.55); }
 
 /***************
@@ -2675,17 +2675,17 @@ check:backdrop:checked:insensitive {
   .titlebar check:backdrop:checked:insensitive button.titlebutton {
     icon-shadow: none; }
 
-.menu .menuitem.check {
+menu menuitem.check {
   -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
   color: #a6a8a7;
   icon-shadow: none; }
-  .menu .menuitem.check:active, .menu .menuitem.check:checked {
+  menu menuitem.check:active, menu menuitem.check:checked {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
-  .menu .menuitem.check:inconsistent {
+  menu menuitem.check:inconsistent {
     -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
-  .menu .menuitem.check:hover {
+  menu menuitem.check:hover {
     color: #ffffff; }
-  .menu .menuitem.check:insensitive {
+  menu menuitem.check:insensitive {
     color: #676b6b; }
 
 radio {
@@ -2832,17 +2832,17 @@ radio:backdrop:checked:insensitive {
   .titlebar radio:backdrop:checked:insensitive button.titlebutton {
     icon-shadow: none; }
 
-.menu .menuitem.radio {
+menu menuitem.radio {
   -gtk-icon-source: -gtk-icontheme("radio-symbolic");
   color: #a6a8a7;
   icon-shadow: none; }
-  .menu .menuitem.radio:active, .menu .menuitem.radio:checked {
+  menu menuitem.radio:active, menu menuitem.radio:checked {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
-  .menu .menuitem.radio:inconsistent {
+  menu menuitem.radio:inconsistent {
     -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
-  .menu .menuitem.radio:hover {
+  menu menuitem.radio:hover {
     color: #ffffff; }
-  .menu .menuitem.radio:insensitive {
+  menu menuitem.radio:insensitive {
     color: #676b6b; }
 
 .view.check, .view.radio,
@@ -3506,12 +3506,9 @@ frame,
 GtkScrolledWindow viewport.frame {
   border-style: none; }
 
-.menuitem.separator,
 separator {
   color: rgba(0, 0, 0, 0.1); }
-  GtkFileChooserButton .menuitem.separator.vertical, button.font .menuitem.separator.vertical, GtkFileChooserButton
-  separator.vertical, button.font
-  separator.vertical {
+  GtkFileChooserButton separator.vertical, button.font separator.vertical {
     -GtkWidget-wide-separators: true; }
 
 /*********
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index d2b67dcd3c..2be847ef0c 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1460,7 +1460,7 @@ combobox {
     icon-shadow: none; }
   combobox:backdrop:insensitive {
     color: #c7c7c7; }
-  combobox .menuitem {
+  combobox menuitem {
     text-shadow: none; }
   combobox.separator.vertical {
     -GtkWidget-wide-separators: true; }
@@ -1985,12 +1985,12 @@ treeview.view header .titlebar button.titlebutton,
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1); }
   .menubar:backdrop {
     background-color: #ededed; }
-  .menubar > .menuitem {
+  .menubar > menuitem {
     padding: 4px 8px; }
-    .menubar > .menuitem:hover {
+    .menubar > menuitem:hover {
       box-shadow: inset 0 -3px #4a90d9;
       color: #2a76c6; }
-    .menubar > .menuitem:insensitive {
+    .menubar > menuitem:insensitive {
       color: #8e9192;
       box-shadow: none; }
 
@@ -2003,30 +2003,30 @@ menu,
   .csd menu, .csd
   .menu {
     border: none; }
-  menu .menuitem,
-  .menu .menuitem {
+  menu menuitem,
+  .menu menuitem {
     text-shadow: none;
     padding: 4px; }
-    menu .menuitem:hover,
-    .menu .menuitem:hover {
+    menu menuitem:hover,
+    .menu menuitem:hover {
       color: #ffffff;
       background-color: #4a90d9; }
-    menu .menuitem:insensitive,
-    .menu .menuitem:insensitive {
+    menu menuitem:insensitive,
+    .menu menuitem:insensitive {
       color: #8e9192; }
-      menu .menuitem:insensitive:backdrop,
-      .menu .menuitem:insensitive:backdrop {
+      menu menuitem:insensitive:backdrop,
+      .menu menuitem:insensitive:backdrop {
         color: #c7c7c7; }
-    menu .menuitem:backdrop, menu .menuitem:backdrop:hover,
-    .menu .menuitem:backdrop,
-    .menu .menuitem:backdrop:hover {
+    menu menuitem:backdrop, menu menuitem:backdrop:hover,
+    .menu menuitem:backdrop,
+    .menu menuitem:backdrop:hover {
       color: #8e9192;
       background-color: white; }
-    menu .menuitem.arrow,
-    .menu .menuitem.arrow {
+    menu menuitem arrow,
+    .menu menuitem arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
-    menu .menuitem.arrow:dir(rtl),
-    .menu .menuitem.arrow:dir(rtl) {
+    menu menuitem arrow:dir(rtl),
+    .menu menuitem arrow:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
   menu arrow,
   .menu arrow {
@@ -2047,7 +2047,7 @@ menu,
       background-color: transparent;
       border-color: transparent; }
 
-.menuitem accelerator {
+menuitem accelerator {
   color: alpha(currentColor,0.55); }
 
 /***************
@@ -2765,17 +2765,17 @@ check:backdrop:checked:insensitive {
 .list-row:selected check:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-backdrop-insensitive.png"), url("assets/selected-checkbox-checked-backdrop-insensitive@2.png")); }
 
-.menu .menuitem.check {
+menu menuitem.check {
   -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
   color: #7a7e7f;
   icon-shadow: none; }
-  .menu .menuitem.check:active, .menu .menuitem.check:checked {
+  menu menuitem.check:active, menu menuitem.check:checked {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
-  .menu .menuitem.check:inconsistent {
+  menu menuitem.check:inconsistent {
     -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
-  .menu .menuitem.check:hover {
+  menu menuitem.check:hover {
     color: #ffffff; }
-  .menu .menuitem.check:insensitive {
+  menu menuitem.check:insensitive {
     color: #bebfc0; }
 
 radio {
@@ -2994,17 +2994,17 @@ radio:backdrop:checked:insensitive {
 .list-row:selected radio:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-backdrop-insensitive.png"), url("assets/selected-radio-checked-backdrop-insensitive@2.png")); }
 
-.menu .menuitem.radio {
+menu menuitem.radio {
   -gtk-icon-source: -gtk-icontheme("radio-symbolic");
   color: #7a7e7f;
   icon-shadow: none; }
-  .menu .menuitem.radio:active, .menu .menuitem.radio:checked {
+  menu menuitem.radio:active, menu menuitem.radio:checked {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
-  .menu .menuitem.radio:inconsistent {
+  menu menuitem.radio:inconsistent {
     -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
-  .menu .menuitem.radio:hover {
+  menu menuitem.radio:hover {
     color: #ffffff; }
-  .menu .menuitem.radio:insensitive {
+  menu menuitem.radio:insensitive {
     color: #bebfc0; }
 
 .view.check, .view.radio,
@@ -3668,12 +3668,9 @@ frame,
 GtkScrolledWindow viewport.frame {
   border-style: none; }
 
-.menuitem.separator,
 separator {
   color: rgba(0, 0, 0, 0.1); }
-  GtkFileChooserButton .menuitem.separator.vertical, button.font .menuitem.separator.vertical, GtkFileChooserButton
-  separator.vertical, button.font
-  separator.vertical {
+  GtkFileChooserButton separator.vertical, button.font separator.vertical {
     -GtkWidget-wide-separators: true; }
 
 /*********
-- 
2.30.2